Merge branch 'wip/baedert/for-master'
authorMatthias Clasen <mclasen@redhat.com>
Wed, 14 Oct 2020 19:07:09 +0000 (15:07 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 14 Oct 2020 19:07:09 +0000 (15:07 -0400)
Leaving out the gboolean -> bool change.

1  2 
gtk/gtkmodelbutton.c
gtk/gtkwidget.c

Simple merge
diff --cc gtk/gtkwidget.c
Simple merge